Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:30:32 +0000 (05:30 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 10 Jun 2010 05:30:32 +0000 (05:30 +0000)

Trivial merge